Buttons use the label property for stock ids. (#322565, Milosz Derezynski)

2005-11-28  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkaction.c (gtk_action_sync_button_stock_id)
	(connect_proxy): Buttons use the label property for stock ids.  (#322565,
	Milosz Derezynski)

diff --git a/ChangeLog b/ChangeLog
index 1729178ce920fdb2fb1ec39bdabf48244969576a..1a705767dac0baf6752258b0f4b242aa4d946aa2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2005-11-28  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkaction.c (gtk_action_sync_button_stock_id) 
+       (connect_proxy): Buttons use the label property for stock ids.  (#322565,
+       Milosz Derezynski)
+
        * gtk/gtkiconview.c (update_text_cell, update_pixbuf_cell): Correctly
        handle the cell list and indices into it.  (#321856)
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 1729178ce920fdb2fb1ec39bdabf48244969576a..1a705767dac0baf6752258b0f4b242aa4d946aa2 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,9 @@
 2005-11-28  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkaction.c (gtk_action_sync_button_stock_id) 
+       (connect_proxy): Buttons use the label property for stock ids.  (#322565,
+       Milosz Derezynski)
+
        * gtk/gtkiconview.c (update_text_cell, update_pixbuf_cell): Correctly
        handle the cell list and indices into it.  (#321856)
 

diff --git a/gtk/gtkaction.c b/gtk/gtkaction.c
index df9aee5447b4054f052e204ddf302a9304c74fa0..076d8b4c6e2b2941c7aeab37128f7d5c18c382b2 100644 (file)
--- a/gtk/gtkaction.c
+++ b/gtk/gtkaction.c
@@ -745,7 +745,7 @@ gtk_action_sync_button_stock_id (GtkAction  *action,
                                 GtkWidget  *proxy)
 {
   g_object_set (G_OBJECT (proxy),
-                "stock-id",
+                "label",
                 action->private_data->stock_id,
                 NULL);
 }
@@ -948,7 +948,7 @@ connect_proxy (GtkAction     *action,
        {
          /* synchronise stock-id */
          g_object_set (proxy,
-                       "stock-id", action->private_data->stock_id,
+                       "label", action->private_data->stock_id,
                        NULL);
          g_signal_connect_object (action, "notify::stock-id",
                                   G_CALLBACK (gtk_action_sync_button_stock_id),